projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4db18ca 2ad0566)
bitkeeper revision 1.1277.1.2 (425ae67ayuPkmrSQsIggGCi0FefXZg)
authordjm@djmnc4000.(none) <djm@djmnc4000.(none)>
Mon, 11 Apr 2005 21:04:58 +0000 (21:04 +0000)
committerdjm@djmnc4000.(none) <djm@djmnc4000.(none)>
Mon, 11 Apr 2005 21:04:58 +0000 (21:04 +0000)
Merge http://djm@sportsman.fc.hp.com//home/djm/xeno-unstable-ia64.bk
into djmnc4000.(none):/home/djm/src/xen/test2611.bk

1  2 
xen/arch/ia64/domain.c patch | diff1 | diff2 | blob | history
xen/arch/ia64/xenmisc.c patch | diff1 | diff2 | blob | history
xen/include/asm-ia64/config.h patch | diff1 | diff2 | blob | history

diff --cc xen/arch/ia64/domain.c
Simple merge
diff --cc xen/arch/ia64/xenmisc.c
Simple merge
diff --cc xen/include/asm-ia64/config.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.